From: Ian Campbell Date: Sat, 15 Jun 2013 08:30:47 +0000 (+0100) Subject: xen: arm: fix build after libelf changes. X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~6718 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=b03165b4edf7fe2a441844e11bd2cba0653281f9;p=xen.git xen: arm: fix build after libelf changes. ed65808a8ed4 "libelf: check all pointer accesses" caused: kernel.c: In function 'kernel_elf_load': kernel.c:162:18: error: 'struct elf_binary' has no member named 'dest' make[4]: *** [kernel.o] Error 1 The field is now called dest_base. We also need to populate dest_size. This fixes the build for me although have not tested it. I have a feeling that loading the kernel from an ELF file on ARM doesn't currently work anyway (everyone uses the zImage loader as far as I am aware). Signed-off-by: Ian Campbell Reviewed-by: Andrew Cooper --- diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index 43cf2abc2a..aba5441066 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -159,7 +159,9 @@ static int kernel_try_zimage_prepare(struct kernel_info *info, static void kernel_elf_load(struct kernel_info *info) { printk("Loading ELF image into guest memory\n"); - info->elf.elf.dest = (void*)(unsigned long)info->elf.parms.virt_kstart; + info->elf.elf.dest_base = (void*)(unsigned long)info->elf.parms.virt_kstart; + info->elf.elf.dest_size = + info->elf.parms.virt_kend - info->elf.parms.virt_kstart; elf_load_binary(&info->elf.elf); printk("Free temporary kernel buffer\n");